Skip to content

Rebase to v2.50.0 #5678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 359 commits into from
Jun 16, 2025
Merged

Conversation

dscho
Copy link
Member

@dscho dscho commented Jun 16, 2025

Range-diff relative to
  • 1: 9be1d08 < -: ------------ fixup! Add an issue template

  • 2: d71920c < -: ------------ fixup! Add an issue template

  • 6: e73fefa = 1: 1a745e6 sideband: mask control characters

  • 7: e9c50c3 = 2: d617f2d sideband: introduce an "escape hatch" to allow control characters

  • 8: 8b0a078 = 3: a88e8a6 sideband: do allow ANSI color sequences by default

  • 9: 1465d4c = 4: accebc4 unix-socket: avoid leak when initialization fails

  • 10: 675644f = 5: 10d591d grep: prevent ^$ false match at end of file

  • 11: 2ebb94f = 6: b8df0b5 t9350: point out that refs are not updated correctly

  • 13: 93f4318 = 7: d2bc4e8 transport-helper: add trailing --

  • 12: f84d8fa = 8: 4adbadc mingw: avoid relative #includes

  • 20: 0f70bdb = 9: 6c04bfe remote-helper: check helper status after import/export

  • 21: 42dd6c7 = 10: 6cf984d mingw: demonstrate a problem with certain absolute paths

  • 22: 72dc1a5 = 11: 9723231 clean: do not traverse mount points

  • 15: a834a75 = 12: 2a876cc mingw: include the Python parts in the build

  • 14: 7063803 = 13: 2dd72f1 mingw: order #includes alphabetically

  • 24: 49fd7a5 = 14: 3a99c68 Always auto-gc after calling a fast-import transport

  • 25: afd54e4 = 15: f4bd17d mingw: allow absolute paths without drive prefix

  • 26: 11467ab = 16: 0f81fe5 clean: remove mount points when possible

  • 16: 7b644fa = 17: c4e5bb6 win32/pthread: avoid name clashes with winpthread

  • 17: b337455 = 18: 637957f git-compat-util: avoid redeclaring _DEFAULT_SOURCE

  • 18: 21b9b93 = 19: edfee51 Import the source code of mimalloc v2.2.3

  • 19: 9f7db14 = 20: e14bb39 mimalloc: avoid excessive memory retention

  • 23: c8d01e1 = 21: c5e6196 mimalloc: adjust for building inside Git

  • 30: 84380ff = 22: cfaad13 mimalloc: offer a build-time option to enable it

  • 33: 2a0619a = 23: 769673e mingw: use mimalloc

  • 34: ab04fcc = 24: e8b2073 transport: optionally disable side-band-64k

  • 35: 14986ff = 25: 111c3b2 mingw: do resolve symlinks in getcwd()

  • 36: 3ff40b1 = 26: 853b218 mingw: fix fatal error working on mapped network drives on Windows

  • 27: efca110 = 27: efc4907 mingw: ensure valid CTYPE

  • 28: 6e24398 = 28: c23d782 mingw: demonstrate a git add issue with NTFS junctions

  • 29: 2cc06a7 = 29: 22a44b2 mingw: allow git.exe to be used instead of the "Git wrapper"

  • 31: 88b3a21 = 30: 6811e1d strbuf_realpath(): use platform-dependent API if available

  • 40: e3c52b6 = 31: b10f4e1 t5505/t5516: allow running without .git/branches/ in the templates

  • 32: 853be85 = 32: 57d75f6 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory

  • 39: 8a624d1 = 33: 9c6eb2a http: use new "best effort" strategy for Secure Channel revoke checking

  • 37: 7ccce52 = 34: ba5ab44 clink.pl: fix MSVC compile script to handle libcurl-d.lib

  • 38: 3677584 = 35: a6c62f1 mingw: implement a platform-specific strbuf_realpath()

  • 41: 4ce4d73 = 36: ae64d97 t5505/t5516: fix white-space around redirectors

  • 42: ecd89df = 37: babb7a2 clink.pl: fix libexpatd.lib link error when using MSVC

  • 51: 3e0bf9b = 38: 52ceb89 Makefile: clean up .ilk files when MSVC=1

  • 53: 5967d40 = 39: f732b1d vcbuild: add support for compiling Windows resource files

  • 43: 580bf73 = 40: 5f36207 t3701: verify that we can add lots of files interactively

  • 44: 70600cc = 41: bf07c30 git add -i: handle CR/LF line endings in the interactive input

  • 45: 3c8ffbf = 42: 7d08762 commit: accept "scissors" with CR/LF line endings

  • 46: 0fb397b = 43: 639add6 t0014: fix indentation

  • 47: 1ed143a = 44: 3806914 git-gui: accommodate for intent-to-add files

  • 48: 372ccc7 = 45: 3841ddc vcpkg_install: detect lack of Git

  • 49: 459ec1e = 46: f22ca01 vcpkg_install: add comment regarding slow network connections

  • 50: 817fe8f = 47: ad274da vcbuild: install ARM64 dependencies when building ARM64 binaries

  • 52: 5acde99 = 48: 420ebeb vcbuild: add an option to install individual 'features'

  • 54: 06e6a98 = 49: 0da5e60 cmake: allow building for Windows/ARM64

  • 55: b57cf14 = 50: 36833e2 config.mak.uname: add git.rc to MSVC builds

  • 56: 4f49d9e = 51: 2f8d6e5 ci(vs-build) also build Windows/ARM64 artifacts

  • 57: 07a0143 = 52: 3030f86 clink.pl: ignore no-stack-protector arg on MSVC=1 builds

  • 58: acdbf8d = 53: f03d925 Add schannel to curl installation

  • 59: ceda56d = 54: 163fed0 clink.pl: move default linker options for MSVC=1 builds

  • 60: 74c1ba8 = 55: a986e9f cmake(): allow setting HOST_CPU for cross-compilation

  • 61: 68f7e59 = 56: da57fb4 cmake: install headless-git.

  • 69: c8333df = 57: 41ea76e mingw: allow for longer paths in parse_interpreter()

  • 62: babfd65 = 58: ab835c0 CMake: default Visual Studio generator has changed

  • 63: 127ef69 = 59: 74818bf hash-object: demonstrate a >4GB/LLP64 problem

  • 64: c65a9ec = 60: 19b48f3 .gitignore: add Visual Studio CMakeSetting.json file

  • 65: 3e12b5d = 61: 92da2cf object-file.c: use size_t for header lengths

  • 66: 9aa8737 = 62: 8a0a92d subtree: update contrib/subtree test target

  • 67: d49d8a0 = 63: acfa111 CMakeLists: add default "x64-windows" arch for Visual Studio

  • 68: 8475931 = 64: 60ed369 hash algorithms: use size_t for section lengths

  • 70: 0dba464 = 65: 7c72141 compat/vcbuild: document preferred way to build in Visual Studio

  • 71: 9b58f03 = 66: 04f1e49 http: optionally send SSL client certificate

  • 72: d2b4c19 = 67: 058551e ci: run contrib/subtree tests in CI builds

  • 73: bee2496 = 68: b99cffb CMake: show Win32 and Generator_platform build-option values

  • 74: 514b162 = 69: 7a3b6c6 init: do parse all core.* settings early

  • 75: 6b71feb = 70: 176901f hash-object --stdin: verify that it works with >4GB/LLP64

  • 76: 937caaf = 71: 6180a3e hash-object: add another >4GB/LLP64 test case

  • 77: 3a4578c = 72: 18e3a9e setup: properly use "%(prefix)/" when in WSL

  • 78: dea0430 = 73: b8b1c52 Add config option windows.appendAtomically

  • 79: 531aa17 = 74: eba3061 MinGW: link as terminal server aware

  • 80: e77d7a1 = 75: ecc0cb8 hash-object: add a >4GB/LLP64 test case using filtered input

  • 81: 3c103b5 = 76: d23b2c9 compat/mingw.c: do not warn when failing to get owner

  • 82: 0a76eca = 77: 9bb002e mingw: $env:TERM="xterm-256color" for newer OSes

  • 83: 70ee9bf = 78: e7d9a33 winansi: check result and Buffer before using Name

  • 84: 0285dde = 79: e68b47b mingw: change core.fsyncObjectFiles = 1 by default

  • 85: 9e7ccf8 = 80: ed5d3c8 Fix Windows version resources

  • 87: 5338ae8 = 81: cd03754 http: optionally load libcurl lazily

  • 88: 425d33f = 82: a9a9151 http: support lazy-loading libcurl also on Windows

  • 89: b6b2717 = 83: b02ee7e http: when loading libcurl lazily, allow for multiple SSL backends

  • 86: 1dddbdb = 84: 4e8cb02 status: fix for old-style submodules with commondir

  • 90: b08bb43 = 85: 066a6fc windows: skip linking git-<command> for built-ins

  • 91: ba97430 = 86: 640e3b1 windows: fix Repository>Explore Working Copy

  • 92: 073762f = 87: c9fd585 mingw: do load libcurl dynamically by default

  • 93: 85e3ebd = 88: 2291199 Add a GitHub workflow to verify that Git/Scalar work in Nano Server

  • 94: a2df6ee = 89: 39df87a mingw: suggest windows.appendAtomically in more cases

  • 95: 3bb9c2f = 90: 221fda4 win32: use native ANSI sequence processing, if possible

  • 98: d4f69b1 = 91: 1434a13 ci: work around a problem with HTTP/2 vs libcurl v8.10.0

  • 99: f209010 = 92: 58f859c revision: create mark_trees_uninteresting_dense()

  • 100: 2faba74 = 93: df0e2e3 pack-objects: extract should_attempt_deltas()

  • 96: a693ad9 = 94: 669f35a git.rc: include winuser.h

  • 97: bc719e2 = 95: ca8058e common-main.c: fflush stdout buffer upon exit

  • 107: 10ffda2 = 96: 9341aa2 t5601/t7406(mingw): do run tests with symlink support

  • 108: f97ec05 = 97: ddd2e35 win32: ensure that localtime_r() is declared even in i686 builds

  • 109: 39dbd7d = 98: 36b9ab1 Fallback to AppData if XDG_CONFIG_HOME is unset

  • 110: 75896e1 = 99: e5d3309 run-command: be helpful with Git LFS fails on Windows 7

  • 101: b12b436 = 100: bc7cad7 pack-objects: add --path-walk option

  • 102: 2c32add = 101: 8540080 pack-objects: introduce GIT_TEST_PACK_PATH_WALK

  • 103: 125101f = 102: 29fe978 repack: add --path-walk option

  • 104: 9cd9f31 = 103: 423991f pack-objects: enable --path-walk via config

  • 105: 29024ed = 104: 5d86e1d scalar: enable path-walk during push via config

  • 106: 0c24151 = 105: 2c4dc79 pack-objects: refactor path-walk delta phase

  • 111: bb27ee4 = 106: acf05fc pack-objects: thread the path-based compression

  • 112: a7fec1b = 107: d78963f survey: stub in new experimental 'git-survey' command

  • 113: 2f7e431 = 108: ac3f9ab survey: add command line opts to select references

  • 114: d790833 = 109: f169387 survey: start pretty printing data in table form

  • 115: 1422871 = 110: 7e2adef survey: add object count summary

  • 116: 3564cae = 111: 53ec7ac survey: summarize total sizes by object type

  • 117: 9124e8f = 112: a2cb463 survey: show progress during object walk

  • 121: a9fac0d = 113: 5221426 mingw: make sure errno is set correctly when socket operations fail

  • 118: d27d17c = 114: efc2210 survey: add ability to track prioritized lists

  • 123: 0a19fc6 = 115: d4a6fa8 compat/mingw: handle WSA errors in strerror

  • 119: 5185b1c = 116: 1667974 survey: add report of "largest" paths

  • 124: 5ec808b = 117: 8f1cde4 compat/mingw: drop outdated comment

  • 120: 66c44c5 = 118: 1ffeabc survey: add --top= option and config

  • 126: 57d707b = 119: 7a65e91 t0301: actually test credential-cache on Windows

  • 125: e5585c4 = 120: ba5e368 mingw_open_existing: handle directories better

  • 122: a306d2b = 121: d07bab6 survey: clearly note the experimental nature in the output

  • 128: 45289af = 122: f727a5c credential-cache: handle ECONNREFUSED gracefully

  • 127: 9db3a65 = 123: 5ae11fb mingw: drop Windows 7-specific work-around

  • 129: 22f42a0 = 124: 1f18247 mingw_rename: support ReFS on Windows 2022

  • 130: ba750ef = 125: 690317b max_tree_depth: lower it for clangarm64 on Windows

  • 131: 0b382eb = 126: e42eb3a reftable: do make sure to use custom allocators

  • 132: 29b1daf = 127: f6623c0 check-whitespace: avoid alerts about upstream commits

  • 133: 72b5a89 = 128: 6a89785 refs: forbid clang to complain about unreachable code

  • 134: 762bcee = 129: 3ae8f00 mingw: avoid the comma operator

  • 135: 19e3c64 = 130: f1f658a git-gui: provide question helper for retry fallback on Windows

  • 136: df96210 = 131: 076c4bc git gui: set GIT_ASKPASS=git-gui--askpass if not set yet

  • 137: 48767d4 = 132: 836d93a git-gui--askyesno: fix funny text wrapping

  • 140: 5f44a60 = 133: bd7eced Win32: make FILETIME conversion functions public

  • 138: 2148e97 = 134: b268b38 git-gui--askyesno: allow overriding the window title

  • 141: 4e349eb = 135: 95207d7 Win32: dirent.c: Move opendir down

  • 139: a7682a9 = 136: cd38930 git-gui--askyesno (mingw): use Git for Windows' icon, if available

  • 142: 9451c6b = 137: f079388 mingw: make the dirent implementation pluggable

  • 143: d1f5e7c = 138: 3118fe4 Win32: make the lstat implementation pluggable

  • 144: 63df1b2 = 139: 94306ce mingw: add infrastructure for read-only file system level caches

  • 145: 1238254 = 140: 70970a0 mingw: add a cache below mingw's lstat and dirent implementations

  • 146: 4319937 = 141: d45276e fscache: load directories only once

  • 147: 666f0f3 = 142: 30246b2 fscache: add key for GIT_TRACE_FSCACHE

  • 148: 25891d5 = 143: bc6742d fscache: remember not-found directories

  • 149: 8b5acc4 = 144: ad49d02 fscache: add a test for the dir-not-found optimization

  • 150: 21ad54f = 145: de161d8 add: use preload-index and fscache for performance

  • 151: 1b7d89a = 146: b085399 dir.c: make add_excludes aware of fscache during status

  • 152: 382c1ca = 147: 9d9969a fscache: make fscache_enabled() public

  • 153: b620199 = 148: 51adab6 dir.c: regression fix for add_excludes with fscache

  • 154: 20c069d = 149: 067aced fetch-pack.c: enable fscache for stats under .git/objects

  • 155: bbc8a77 = 150: 9d9a0f6 checkout.c: enable fscache for checkout again

  • 156: 683541b = 151: b1784d1 Enable the filesystem cache (fscache) in refresh_index().

  • 157: 96870d1 = 152: c255572 fscache: use FindFirstFileExW to avoid retrieving the short name

  • 158: 0404729 = 153: 311c3cb fscache: add GIT_TEST_FSCACHE support

  • 159: 8202d91 = 154: b6e9a97 fscache: add fscache hit statistics

  • 160: 485f368 = 155: c193f85 unpack-trees: enable fscache for sparse-checkout

  • 161: ce0f7bf = 156: 77a9a3c status: disable and free fscache at the end of the status command

  • 162: 01f8fe8 = 157: 47f2a58 mem_pool: add GIT_TRACE_MEMPOOL support

  • 163: 893eb52 = 158: 9ddcc39 fscache: fscache takes an initial size

  • 164: c4b7a7c = 159: cbd0c7a fscache: update fscache to be thread specific instead of global

  • 165: d825c1a = 160: 691faa9 fscache: teach fscache to use mempool

  • 166: 6e602fe = 161: 8b3728d fscache: make fscache_enable() thread safe

  • 167: 72f7d84 = 162: bd6dd4a fscache: teach fscache to use NtQueryDirectoryFile

  • 168: 4c37726 = 163: 4288b80 fscache: remember the reparse tag for each entry

  • 169: 51af6d4 = 164: 6b0e315 fscache: implement an FSCache-aware is_mount_point()

  • 170: 0204799 = 165: 28a43e4 clean: make use of FSCache

  • 171: fd9254d = 166: 1d7eb88 pack-objects (mingw): demonstrate a segmentation fault with large deltas

  • 172: b54ee6b = 167: bc9acf2 mingw: support long paths

  • 173: dfa2022 = 168: c5adb22 Win32: fix 'lstat("dir/")' with long paths

  • 174: 7e5a28e = 169: c9c48e1 win32(long path support): leave drive-less absolute paths intact

  • 175: 9f20584 = 170: 7c27dca compat/fsmonitor/fsm-*-win32: support long paths

  • 176: 34661cd = 171: 7a84517 clean: suggest using core.longPaths if paths are too long to remove

  • 177: d203d8c = 172: ae5ff16 mingw: Support git_terminal_prompt with more terminals

  • 178: a961e06 = 173: fb63639 compat/terminal.c: only use the Windows console if bash 'read -r' fails

  • 179: 611e27b = 174: 689b042 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method

  • 180: 490a3c0 = 175: 4837ae8 strbuf_readlink: don't call readlink twice if hint is the exact link size

  • 181: e967942 = 176: fff1672 strbuf_readlink: support link targets that exceed PATH_MAX

  • 182: be48cae = 177: c1cf6af lockfile.c: use is_dir_sep() instead of hardcoded '/' checks

  • 183: 6ad1837 = 178: b697549 Win32: don't call GetFileAttributes twice in mingw_lstat()

  • 184: de29ee1 = 179: b4b1063 Win32: implement stat() with symlink support

  • 185: cc5ef05 = 180: ccb932a Win32: remove separate do_lstat() function

  • 186: 540229a = 181: 8bc9990 Win32: let mingw_lstat() error early upon problems with reparse points

  • 187: 3bf8f92 = 182: 81a5a68 mingw: teach fscache and dirent about symlinks

  • 188: f7b9be1 = 183: d46bd33 Win32: lstat(): return adequate stat.st_size for symlinks

  • 189: eb33fd1 = 184: d96d24a Win32: factor out retry logic

  • 190: f15b288 = 185: 08a9d39 Win32: change default of 'core.symlinks' to false

  • 191: 4678cb6 = 186: fbac551 Win32: add symlink-specific error codes

  • 192: 6a9f110 = 187: 865a01b Win32: mingw_unlink: support symlinks to directories

  • 193: c919d0b = 188: 8c48864 Win32: mingw_rename: support renaming symlinks

  • 194: 8d25ba2 = 189: 59d5b76 Win32: mingw_chdir: change to symlink-resolved directory

  • 195: f1f225b = 190: 26d243e Win32: implement readlink()

  • 196: 8d940a1 = 191: 5f2a0fb mingw: lstat: compute correct size for symlinks

  • 197: a035c84 = 192: c04e815 Win32: implement basic symlink() functionality (file symlinks only)

  • 198: b7f3164 = 193: b813fda Win32: symlink: add support for symlinks to directories

  • 199: 45cebe1 = 194: c02904c mingw: try to create symlinks without elevated permissions

  • 200: 97fe22b = 195: 37f87fe mingw: emulate stat() a little more faithfully

  • 201: b7d8caa = 196: 53e3dd6 mingw: special-case index entries for symlinks with buggy size

  • 202: 6b7296f = 197: ff49b6c mingw: introduce code to detect whether we're inside a Windows container

  • 207: 7e61faa = 198: e483d1a Win32: symlink: move phantom symlink creation to a separate function

  • 203: c90f93d = 199: ae666d4 mingw: when running in a Windows container, try to rename() harder

  • 208: fe449d1 = 200: 2002ef6 Introduce helper to create symlinks that knows about index_state

  • 204: 7ea1188 = 201: e5ef2c5 mingw: move the file_attr_to_st_mode() function definition

  • 209: 2504a7b = 202: 27184cb mingw: allow to specify the symlink type in .gitattributes

  • 205: fd2ae2c = 203: d426509 mingw: Windows Docker volumes are not symbolic links

  • 210: 9c0c942 = 204: 26d1a68 Win32: symlink: add test for symlink attribute

  • 206: 81b39a9 = 205: 698d99f mingw: work around rename() failing on a read-only file

  • 211: 00cc6bf = 206: 9d714ab mingw: explicitly specify with which cmd to prefix the cmdline

  • 212: 06fe0fc = 207: 609bcca mingw: when path_lookup() failed, try BusyBox

  • 213: 46b327f = 208: 1438ca0 test-tool: learn to act as a drop-in replacement for iconv

  • 214: 00a06ac = 209: a883d88 tests(mingw): if iconv is unavailable, use test-helper --iconv

  • 215: 59ddc6d = 210: c42ed0e gitattributes: mark .png files as binary

  • 216: 27eed80 = 211: 25717ca tests: move test PNGs into t/lib-diff/

  • 217: 80d8f9b = 212: 70abc43 tests: only override sort & find if there are usable ones in /usr/bin/

  • 218: bc4b1e0 = 213: 5bcc1bd tests: use the correct path separator with BusyBox

  • 219: 7d460bb = 214: 8d6f0af mingw: only use Bash-ism builtin pwd -W when available

  • 220: 379aa45 = 215: aff6520 tests (mingw): remove Bash-specific pwd option

  • 221: 5131e04 = 216: a330e76 test-lib: add BUSYBOX prerequisite

  • 222: 883ff88 = 217: ef0a6a8 t5003: use binary file from t/lib-diff/

  • 223: 09937eb = 218: 4897497 t5532: workaround for BusyBox on Windows

  • 224: ec99e21 = 219: 4dc1b25 t5605: special-case hardlink test for BusyBox-w32

  • 225: 60c0543 = 220: 4595ba6 t5813: allow for $PWD to be a Windows path

  • 226: d2a3f42 = 221: 9296cc6 t9200: skip tests when $PWD contains a colon

  • 227: ac524b4 = 222: b01c6da mingw: add a Makefile target to copy test artifacts

  • 229: aa525ff = 223: bafb6b3 mingw: kill child processes in a gentler way

  • 228: 67f90f9 = 224: 7f641f0 mingw: optionally enable wsl compability file mode bits

  • 231: 7993c46 = 225: 733400d mingw: do not call xutftowcs_path in mingw_mktemp

  • 230: b408621 = 226: e224996 mingw: really handle SIGINT

  • 232: 608f35a = 227: eaba9c3 Partially un-revert "editor: save and reset terminal after calling EDITOR"

  • 233: e725789 = 228: 60d090c reset: reinstate support for the deprecated --stdin option

  • 234: 60ad39e = 229: 3cb735a fsmonitor: reintroduce core.useBuiltinFSMonitor

  • 235: 51ca0d6 = 230: c947613 Describe Git for Windows' architecture [no ci]

  • 236: 769584b = 231: dac0898 Modify the Code of Conduct for Git for Windows

  • 237: 203922b = 232: 08e5bbf CONTRIBUTING.md: add guide for first-time contributors

  • 238: 6cdd223 = 233: 0e14058 README.md: Add a Windows-specific preamble

  • 240: 857fc12 = 234: a1253d7 Add a GitHub workflow to monitor component updates

  • 3: 42fdd21 ! 235: 3c77ab0 fixup! Add an issue template

    @@
      ## Metadata ##
    -Author: Matthias Aßhauer <mha1993@live.de>
    +Author: Brendan Forster <brendan@github.com>
     
      ## Commit message ##
    -    fixup! Add an issue template
    +    Add an issue template
     
    -    Turn the issue template into an issue form to reduce the number of
    -    issues that are just the blank template with no information.
    +    With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and
    +    Philip Oakley.
     
    -    Signed-off-by: Matthias Aßhauer <mha1993@live.de>
    -
    - ## .github/ISSUE_TEMPLATE/bug-report.md (deleted) ##
    -@@
    -----
    --name: Bug report
    --about: Use this template to report bugs.
    -----
    -- - [ ] I was not able to find an [open](https://github.com/git-for-windows/git/issues?q=is%3Aopen) or [closed](https://github.com/git-for-windows/git/issues?q=is%3Aclosed) issue matching what I'm seeing
    --
    --### Setup
    --
    -- - Which version of Git for Windows are you using? Is it 32-bit or 64-bit?
    --
    --```
    --$ git --version --build-options
    --
    --** insert your machine's response here **
    --```
    --
    -- - Which version of Windows are you running? 8.1, 10, 11? Is it 32-bit or 64-bit?
    --
    --```
    --$ cmd.exe /c ver
    --
    --** insert your machine's response here **
    --```
    --
    -- - What options did you set as part of the installation? Or did you choose the
    --   defaults?
    --
    --```
    --# One of the following:
    --> type "C:\Program Files\Git\etc\install-options.txt"
    --> type "C:\Program Files (x86)\Git\etc\install-options.txt"
    --> type "%USERPROFILE%\AppData\Local\Programs\Git\etc\install-options.txt"
    --> type "$env:USERPROFILE\AppData\Local\Programs\Git\etc\install-options.txt"
    --$ cat /etc/install-options.txt
    --
    --** insert your machine's response here **
    --```
    --
    -- - Any other interesting things about your environment that might be related
    --   to the issue you're seeing?
    --
    --** insert your response here **
    --
    --### Details
    --
    -- - Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other
    --
    --** insert your response here **
    --
    -- - What commands did you run to trigger this issue? If you can provide a
    --   [Minimal, Complete, and Verifiable example](http://stackoverflow.com/help/mcve)
    --   this will help us understand the issue.
    --
    --```
    --** insert your commands here **
    --```
    -- - What did you expect to occur after running these commands?
    --
    --** insert here **
    --
    -- - What actually happened instead?
    --
    --** insert here **
    --
    -- - If the problem was occurring with a specific repository, can you provide the
    --   URL to that repository to help us with testing?
    --
    --** insert URL here **
    +    Helped-by: Clive Chan <cc@clive.io>
    +    Helped-by: Adric Norris <landstander668@gmail.com>
    +    Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
    +    Helped-by: Philip Oakley <philipoakley@iee.org>
    +    Signed-off-by: Brendan Forster <brendan@github.com>
    +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
     
      ## .github/ISSUE_TEMPLATE/bug-report.yml (new) ##
     @@
    @@ .github/ISSUE_TEMPLATE/bug-report.yml (new)
     +    id: git-for-windows-version
     +    attributes:
     +      label: Git for Windows version
    -+      description: Which version of Git for Windows are you using? Is it 32-bit or 64-bit?
    ++      description: Which version of Git for Windows are you using?
     +      placeholder: Please insert the output of `git --version --build-options` here
     +      render: shell
     +    validations:
    @@ .github/ISSUE_TEMPLATE/bug-report.yml (new)
     +    id: windows-arch
     +    attributes:
     +      label: Windows CPU architecture
    -+      description: Is your Windows 32-bit or 64-bit?
    ++      description: What CPU Archtitecture does your Windows target?
     +      options:
    -+        - 32-bit
    -+        - 64-bit
    ++        - i686 (32-bit)
    ++        - x86_64 (64-bit)
    ++        - ARM64
     +      default: 1
     +    validations:
     +      required: true
    @@ .github/ISSUE_TEMPLATE/bug-report.yml (new)
     +      label: Repository
     +      description: If the problem was occurring with a specific repository, can you provide the URL to that repository to help us with testing?
      \ No newline at end of file
    +
    + ## .github/ISSUE_TEMPLATE/config.yml (new) ##
    +@@
    ++blank_issues_enabled: false
    + \ No newline at end of file
  • 4: 0a80b4c < -: ------------ fixup! Add an issue template

  • 5: 0f09e10 < -: ------------ fixup! Add an issue template

  • 239: 88bffa8 < -: ------------ Add an issue template

  • 242: 82feb60 = 236: 989075c dependabot: help keeping GitHub Actions versions up to date

  • 241: f0b2870 = 237: 5f48b3f Modify the GitHub Pull Request template (to reflect Git for Windows)

  • 243: 9e4931f = 238: 1030c64 SECURITY.md: document Git for Windows' policies

  • 244: 0c4cacb (upstream: 882efe0) < -: ------------ ci(coverity): fix building on Windows

  • 245: 5ce9ac2 (upstream: 3cc4fc1) < -: ------------ ci(coverity): output the build log upon error

1480c1 and others added 30 commits June 16, 2025 20:51
NtQueryObject under Wine can return a success but fill out no name.
In those situations, Wine will set Buffer to NULL, and set result to
the sizeof(OBJECT_NAME_INFORMATION).

Running a command such as

echo "$(git.exe --version 2>/dev/null)"

will crash due to a NULL pointer dereference when the code attempts to
null terminate the buffer, although, weirdly, removing the subshell or
redirecting stdout to a file will not trigger the crash.

Code has been added to also check Buffer and Length to ensure the check
is as robust as possible due to the current behavior being fragile at
best, and could potentially change in the future

This code is based on the behavior of NtQueryObject under wine and
reactos.

Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Atomic append on windows is only supported on local disk files, and it may
cause errors in other situations, e.g. network file system. If that is the
case, this config option should be used to turn atomic append off.

Co-Authored-By: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: 孙卓识 <sunzhuoshi@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
From the documentation of said setting:

	This boolean will enable fsync() when writing object files.

	This is a total waste of time and effort on a filesystem that
	orders data writes properly, but can be useful for filesystems
	that do not use journalling (traditional UNIX filesystems) or
	that only journal metadata and not file contents (OS X’s HFS+,
	or Linux ext3 with "data=writeback").

The most common file system on Windows (NTFS) does not guarantee that
order, therefore a sudden loss of power (or any other event causing an
unclean shutdown) would cause corrupt files (i.e. files filled with
NULs). Therefore we need to change the default.

Note that the documentation makes it sound as if this causes really bad
performance. In reality, writing loose objects is something that is done
only rarely, and only a handful of files at a time.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Whith Windows 2000, Microsoft introduced a flag to the PE header to mark executables as
"terminal server aware". Windows terminal servers provide a redirected Windows directory and
redirected registry hives when launching legacy applications without this flag set. Since we
do not use any INI files in the Windows directory and don't write to the registry, we don't
need  this additional preparation. Telling the OS that we don't need this should provide
slightly improved startup times in terminal server environments.

When building for supported Windows Versions with MSVC the /TSAWARE linker flag is
automatically set, but MinGW requires us to set the --tsaware flag manually.

This partially addresses git-for-windows#3935.

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Add FileVersion, which is a required field
As not all required fields were present, none were being included
Fixes git-for-windows#4090

Signed-off-by: Kiel Hurley <kielhurley@gmail.com>
This compile-time option allows to ask Git to load libcurl dynamically
at runtime.

Together with a follow-up patch that optionally overrides the file name
depending on the `http.sslBackend` setting, this kicks open the door for
installing multiple libcurl flavors side by side, and load the one
corresponding to the (runtime-)configured SSL/TLS backend.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This implements the Windows-specific support code, because everything is
slightly different on Windows, even loading shared libraries.

Note: I specifically do _not_ use the code from
`compat/win32/lazyload.h` here because that code is optimized for
loading individual functions from various system DLLs, while we
specifically want to load _many_ functions from _one_ DLL here, and
distinctly not a system DLL (we expect libcurl to be located outside
`C:\Windows\system32`, something `INIT_PROC_ADDR` refuses to work with).
Also, the `curl_easy_getinfo()`/`curl_easy_setopt()` functions are
declared as vararg functions, which `lazyload.h` cannot handle. Finally,
we are about to optionally override the exact file name that is to be
loaded, which is a goal contrary to `lazyload.h`'s design.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The previous commits introduced a compile-time option to load libcurl
lazily, but it uses the hard-coded name "libcurl-4.dll" (or equivalent
on platforms other than Windows).

To allow for installing multiple libcurl flavors side by side, where
each supports one specific SSL/TLS backend, let's first look whether
`libcurl-<backend>-4.dll` exists, and only use `libcurl-4.dll` as a fall
back.

That will allow us to ship with a libcurl by default that only supports
the Secure Channel backend for the `https://` protocol. This libcurl
won't suffer from any dependency problem when upgrading OpenSSL to a new
major version (which will change the DLL name, and hence break every
program and library that depends on it).

This is crucial because Git for Windows relies on libcurl to keep
working when building and deploying a new OpenSSL package because that
library is used by `git fetch` and `git clone`.

Note that this feature is by no means specific to Windows. On Ubuntu,
for example, a `git` built using `LAZY_LOAD_LIBCURL` will use
`libcurl.so.4` for `http.sslbackend=openssl` and `libcurl-gnutls.so.4`
for `http.sslbackend=gnutls`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In f9b7573 (repository: free fields before overwriting them,
2017-09-05), Git was taught to release memory before overwriting it, but
357a03e (repository.c: move env-related setup code back to
environment.c, 2018-03-03) changed the code so that it would not
_always_ be overwritten.

As a consequence, the `commondir` attribute would point to
already-free()d memory.

This seems not to cause problems in core Git, but there are add-on
patches in Git for Windows where the `commondir` attribute is
subsequently used and causing invalid memory accesses e.g. in setups
containing old-style submodules (i.e. the ones with a `.git` directory
within theirs worktrees) that have `commondir` configured.

This fixes git-for-windows#4083.

Signed-off-by: Andrey Zabavnikov <zabavnikov@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is merely a historical wart that, say, `git-commit` exists in the
`libexec/git-core/` directory, a tribute to the original idea to let Git
be essentially a bunch of Unix shell scripts revolving around very few
"plumbing" (AKA low-level) commands.

Git has evolved a lot from there. These days, most of Git's
functionality is contained within the `git` executable, in the form of
"built-in" commands.

To accommodate for scripts that use the "dashed" form of Git commands,
even today, Git provides hard-links that make the `git` executable
available as, say, `git-commit`, just in case that an old script has not
been updated to invoke `git commit`.

Those hard-links do not come cheap: they take about half a minute for
every build of Git on Windows, they are mistaken for taking up huge
amounts of space by some Windows Explorer versions that do not
understand hard-links, and therefore many a "bug" report had to be
addressed.

The "dashed form" has been officially deprecated in Git version 1.5.4,
which was released on February 2nd, 2008, i.e. a very long time ago.
This deprecation was never finalized by skipping these hard-links, but
we can start the process now, in Git for Windows.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since Git v2.39.1, we are a bit more stringent in searching the PATH. In
particular, we specifically require the `.exe` suffix.

However, the `Repository>Explore Working Copy` command asks for
`explorer.exe` to be found on the `PATH`, which _already_ has that
suffix.

Let's unstartle the PATH-finding logic about this scenario.

This fixes git-for-windows#4356

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This will help with Git for Windows' maintenance going forward: It
allows Git for Windows to switch its primary libcurl to a variant
without the OpenSSL backend, while still loading an alternate when
setting `http.sslBackend = openssl`.

This is necessary to avoid maintenance headaches with upgrading OpenSSL:
its major version name is encoded in the shared library's file name and
hence major version updates (temporarily) break libraries that are
linked against the OpenSSL library.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In Git for Windows v2.39.0, we fixed a regression where `git.exe` would
no longer work in Windows Nano Server (frequently used in Docker
containers).

This GitHub workflow can be used to verify manually that the Git/Scalar
executables work in Nano Server.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When running Git for Windows on a remote APFS filesystem, it would
appear that the `mingw_open_append()`/`write()` combination would fail
almost exactly like on some CIFS-mounted shares as had been reported in
git-for-windows#2753, albeit with a
different `errno` value.

Let's handle that `errno` value just the same, by suggesting to set
`windows.appendAtomically=false`.

Signed-off-by: David Lomas <dl3@pale-eds.co.uk>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Windows 10 version 1511 (also known as Anniversary Update), according to
https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
introduced native support for ANSI sequence processing. This allows
using colors from the entire 24-bit color range.

All we need to do is test whether the console's "virtual processing
support" can be enabled. If it can, we do not even need to start the
`console_thread` to handle ANSI sequences.

Or, almost all we need to do: When `console_thread()` does its work, it
uses the Unicode-aware `write_console()` function to write to the Win32
Console, which supports Git for Windows' implicit convention that all
text that is written is encoded in UTF-8. The same is not necessarily
true if native ANSI sequence processing is used, as the output is then
subject to the current code page. Let's ensure that the code page is set
to `CP_UTF8` as long as Git writes to it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The sparse tree walk algorithm was created in d5d2e93 (revision:
implement sparse algorithm, 2019-01-16) and involves using the
mark_trees_uninteresting_sparse() method. This method takes a repository
and an oidset of tree IDs, some of which have the UNINTERESTING flag and
some of which do not.

Create a method that has an equivalent set of preconditions but uses a
"dense" walk (recursively visits all reachable trees, as long as they
have not previously been marked UNINTERESTING). This is an important
difference from mark_tree_uninteresting(), which short-circuits if the
given tree has the UNINTERESTING flag.

A use of this method will be added in a later change, with a condition
set whether the sparse or dense approach should be used.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
This will be helpful in a future change.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
winuser.h contains the definition of RT_MANIFEST that our LLVM based
toolchain needs to understand that we want to embed
compat/win32/git.manifest as an application manifest. It currently just
embeds it as additional data that Windows doesn't understand.

This also helps our GCC based toolchain understand that we only want one
copy embedded. It currently embeds one working assembly manifest and one
nearly identical, but useless copy as additional data.

This also teaches our Visual Studio based buildsystems to pick up the
manifest file from git.rc. This means we don't have to explicitly specify
it in contrib/buildsystems/Generators/Vcxproj.pm anymore. Slightly
counter-intuitively this also means we have to explicitly tell Cmake
not to embed a default manifest.

This fixes git-for-windows#4707

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
By default, the buffer type of Windows' `stdout` is unbuffered (_IONBF),
and there is no need to manually fflush `stdout`.

But some programs, such as the Windows Filtering Platform driver
provided by the security software, may change the buffer type of
`stdout` to full buffering. This nees `fflush(stdout)` to be called
manually, otherwise there will be no output to `stdout`.

Signed-off-by: MinarKotonoha <chengzhuo5@qq.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A long time ago, we decided to run tests in Git for Windows' SDK with
the default `winsymlinks` mode: copying instead of linking. This is
still the default mode of MSYS2 to this day.

However, this is not how most users run Git for Windows: As the majority
of Git for Windows' users seem to be on Windows 10 and newer, likely
having enabled Developer Mode (which allows creating symbolic links
without administrator privileges), they will run with symlink support
enabled.

This is the reason why it is crucial to get the fixes for CVE-2024-? to
the users, and also why it is crucial to ensure that the test suite
exercises the related test cases. This commit ensures the latter.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `__MINGW64__` constant is defined, surprise, surprise, only when
building for a 64-bit CPU architecture.

Therefore using it as a guard to define `_POSIX_C_SOURCE` (so that
`localtime_r()` is declared, among other functions) is not enough, we
also need to check `__MINGW32__`.

Technically, the latter constant is defined even for 64-bit builds. But
let's make things a bit easier to understand by testing for both
constants.

Making it so fixes this compile warning (turned error in GCC v14.1):

  archive-zip.c: In function 'dos_time':
  archive-zip.c:612:9: error: implicit declaration of function 'localtime_r';
  did you mean 'localtime_s'? [-Wimplicit-function-declaration]
    612 |         localtime_r(&time, &tm);
        |         ^~~~~~~~~~~
        |         localtime_s

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In order to be a better Windows citizenship, Git should
save its configuration files on AppData folder. This can
enables git configuration files be replicated between machines
using the same Microsoft account logon which would reduce the
friction of setting up Git on new systems. Therefore, if
%APPDATA%\Git\config exists, we use it; otherwise
$HOME/.config/git/config is used.

Signed-off-by: Ariel Lourenco <ariellourenco@users.noreply.github.com>
Git LFS is now built with Go 1.21 which no longer supports Windows 7.
However, Git for Windows still wants to support Windows 7.

Ideally, Git LFS would re-introduce Windows 7 support until Git for
Windows drops support for Windows 7, but that's not going to happen:
git-for-windows#4996 (comment)

The next best thing we can do is to let the users know what is
happening, and how to get out of their fix, at least.

This is not quite as easy as it would first seem because programs
compiled with Go 1.21 or newer will simply throw an exception and fail
with an Access Violation on Windows 7.

The only way I found to address this is to replicate the logic from Go's
very own `version` command (which can determine the Go version with
which a given executable was built) to detect the situation, and in that
case offer a helpful error message.

This addresses git-for-windows#4996.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
As reported in https://lore.kernel.org/git/ZuPKvYP9ZZ2mhb4m@pks.im/,
libcurl v8.10.0 had a regression that was picked up by Git's t5559.30
"large fetch-pack requests can be sent using chunked encoding".

This bug was fixed in libcurl v8.10.1.

Sadly, the macos-13 runner image was updated in the brief window between
these two libcurl versions, breaking each and every CI build, as
reported at git-for-windows#5159.

This would usually not matter, we would just ignore the failing CI
builds until the macos-13 runner image is rebuilt in a couple of days,
and then the CI builds would succeed again.

However.

As has become the custom, a surprise Git version was released, and now
that Git for Windows wants to follow suit, since Git for Windows has
this custom of trying to never release a version with a failing CI
build, we _must_ work around it.

This patch implements this work-around, basically for the sake of Git
for Windows v2.46.2's CI build.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In order to more easily compute delta bases among objects that appear at the
exact same path, add a --path-walk option to 'git pack-objects'.

This option will use the path-walk API instead of the object walk given by
the revision machinery. Since objects will be provided in batches
representing a common path, those objects can be tested for delta bases
immediately instead of waiting for a sort of the full object list by
name-hash. This has multiple benefits, including avoiding collisions by
name-hash.

The objects marked as UNINTERESTING are included in these batches, so we
are guaranteeing some locality to find good delta bases.

After the individual passes are done on a per-path basis, the default
name-hash is used to find other opportunistic delta bases that did not
match exactly by the full path name.

RFC TODO: It is important to note that this option is inherently
incompatible with using a bitmap index. This walk probably also does not
work with other advanced features, such as delta islands.

Getting ahead of myself, this option compares well with --full-name-hash
when the packfile is large enough, but also performs at least as well as
the default in all cases that I've seen.

RFC TODO: this should probably be recording the batch locations to another
list so they could be processed in a second phase using threads.

RFC TODO: list some examples of how this outperforms previous pack-objects
strategies. (This is coming in later commits that include performance
test changes.)

Signed-off-by: Derrick Stolee <stolee@gmail.com>
Start work on a new 'git survey' command to scan the repository
for monorepo performance and scaling problems.  The goal is to
measure the various known "dimensions of scale" and serve as a
foundation for adding additional measurements as we learn more
about Git monorepo scaling problems.

The initial goal is to complement the scanning and analysis performed
by the GO-based 'git-sizer' (https://github.com/github/git-sizer) tool.
It is hoped that by creating a builtin command, we may be able to take
advantage of internal Git data structures and code that is not
accessible from GO to gain further insight into potential scaling
problems.

Co-authored-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Jeff Hostetler <git@jeffhostetler.com>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
There are many tests that validate whether 'git pack-objects' works as
expected. Instead of duplicating these tests, add a new test environment
variable, GIT_TEST_PACK_PATH_WALK, that implies --path-walk by default
when specified.

This was useful in testing the implementation of the --path-walk
implementation, especially in conjunction with test such as:

 - t0411-clone-from-partial.sh : One test fetches from a repo that does
   not have the boundary objects. This causes the path-based walk to
   fail. Disable the variable for this test.

 - t5306-pack-nobase.sh : Similar to t0411, one test fetches from a repo
   without a boundary object.

 - t5310-pack-bitmaps.sh : One test compares the case when packing with
   bitmaps to the case when packing without them. Since we disable the
   test variable when writing bitmaps, this causes a difference in the
   object list (the --path-walk option adds an extra object). Specify
   --no-path-walk in both processes for the comparison. Another test
   checks for a specific delta base, but when computing dynamically
   without using bitmaps, the base object it too small to be considered
   in the delta calculations so no base is used.

 - t5316-pack-delta-depth.sh : This script cares about certain delta
   choices and their chain lengths. The --path-walk option changes how
   these chains are selected, and thus changes the results of this test.

 - t5322-pack-objects-sparse.sh : This demonstrates the effectiveness of
   the --sparse option and how it combines with --path-walk.

 - t5332-multi-pack-reuse.sh : This test verifies that the preferred
   pack is used for delta reuse when possible. The --path-walk option is
   not currently aware of the preferred pack at all, so finds a
   different delta base.

 - t7406-submodule-update.sh : When using the variable, the --depth
   option collides with the --path-walk feature, resulting in a warning
   message. Disable the variable so this warning does not appear.

I want to call out one specific test change that is only temporary:

 - t5530-upload-pack-error.sh : One test cares specifically about an
   "unable to read" error message. Since the current implementation
   performs delta calculations within the path-walk API callback, a
   different "unable to get size" error message appears. When this
   is changed in a future refactoring, this test change can be reverted.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
By default we will scan all references in "refs/heads/", "refs/tags/"
and "refs/remotes/".

Add command line opts let the use ask for all refs or a subset of them
and to include a detached HEAD.

Signed-off-by: Jeff Hostetler <git@jeffhostetler.com>
Signed-off-by: Derrick Stolee <stolee@gmail.com>
Since 'git pack-objects' supports a --path-walk option, allow passing it
through in 'git repack'. This presents interesting testing opportunities for
comparing the different repacking strategies against each other.

Add the --path-walk option to the performance tests in p5313.

For the microsoft/fluentui repo [1] checked out at a specific commit [2],
the results are very interesting:

Test                                           this tree
------------------------------------------------------------------
5313.2: thin pack                              0.40(0.47+0.04)
5313.3: thin pack size                                    1.2M
5313.4: thin pack with --full-name-hash        0.09(0.10+0.04)
5313.5: thin pack size with --full-name-hash             22.8K
5313.6: thin pack with --path-walk             0.08(0.06+0.02)
5313.7: thin pack size with --path-walk                  20.8K
5313.8: big pack                               2.16(8.43+0.23)
5313.9: big pack size                                    17.7M
5313.10: big pack with --full-name-hash        1.42(3.06+0.21)
5313.11: big pack size with --full-name-hash             18.0M
5313.12: big pack with --path-walk             2.21(8.39+0.24)
5313.13: big pack size with --path-walk                  17.8M
5313.14: repack                                98.05(662.37+2.64)
5313.15: repack size                                    449.1K
5313.16: repack with --full-name-hash          33.95(129.44+2.63)
5313.17: repack size with --full-name-hash              182.9K
5313.18: repack with --path-walk               106.21(121.58+0.82)
5313.19: repack size with --path-walk                   159.6K

[1] https://github.com/microsoft/fluentui
[2] e70848ebac1cd720875bccaa3026f4a9ed700e08

This repo suffers from having a lot of paths that collide in the name
hash, so examining them in groups by path leads to better deltas. Also,
in this case, the single-threaded implementation is competitive with the
full repack. This is saving time diffing files that have significant
differences from each other.

A similar, but private, repo has even more extremes in the thin packs:

Test                                           this tree
--------------------------------------------------------------
5313.2: thin pack                              2.39(2.91+0.10)
5313.3: thin pack size                                    4.5M
5313.4: thin pack with --full-name-hash        0.29(0.47+0.12)
5313.5: thin pack size with --full-name-hash             15.5K
5313.6: thin pack with --path-walk             0.35(0.31+0.04)
5313.7: thin pack size with --path-walk                  14.2K

Notice, however, that while the --full-name-hash version is working
quite well in these cases for the thin pack, it does poorly for some
other standard cases, such as this test on the Linux kernel repository:

Test                                           this tree
--------------------------------------------------------------
5313.2: thin pack                              0.01(0.00+0.00)
5313.3: thin pack size                                     310
5313.4: thin pack with --full-name-hash        0.00(0.00+0.00)
5313.5: thin pack size with --full-name-hash              1.4K
5313.6: thin pack with --path-walk             0.00(0.00+0.00)
5313.7: thin pack size with --path-walk                    310

Here, the --full-name-hash option does much worse than the default name
hash, but the path-walk option does exactly as well.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
When 'git survey' provides information to the user, this will be presented
in one of two formats: plaintext and JSON. The JSON implementation will be
delayed until the functionality is complete for the plaintext format.

The most important parts of the plaintext format are headers specifying the
different sections of the report and tables providing concreted data.

Create a custom table data structure that allows specifying a list of
strings for the row values. When printing the table, check each column for
the maximum width so we can create a table of the correct size from the
start.

The table structure is designed to be flexible to the different kinds of
output that will be implemented in future changes.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
Philip Oakley and others added 18 commits June 16, 2025 20:52
Git for Windows accepts pull requests; Core Git does not. Therefore we
need to adjust the template (because it only matches core Git's
project management style, not ours).

Also: direct Git for Windows enhancements to their contributions page,
space out the text for easy reading, and clarify that the mailing list
is plain text, not HTML.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around
security issues and about supported versions.

Helped-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
These are Git for Windows' Git GUI and gitk patches. We will have to
decide at some point what to do about them, but that's a little lower
priority (as Git GUI seems to be unmaintained for the time being, and
the gitk maintainer keeps a very low profile on the Git mailing list,
too).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This was pull request git-for-windows#1645 from ZCube/master

Support windows container.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ws#4527)

With this patch, Git for Windows works as intended on mounted APFS
volumes (where renaming read-only files would fail).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This patch introduces support to set special NTFS attributes that are
interpreted by the Windows Subsystem for Linux as file mode bits, UID
and GID.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Handle Ctrl+C in Git Bash nicely

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was
reverted. We partially un-revert this, to get the fix again.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch re-adds the deprecated --stdin/-z options to `git
reset`. Those patches were overridden by a different set of options in
the upstream Git project before we could propose `--stdin`.

We offered this in MinGit to applications that wanted a safer way to
pass lots of pathspecs to Git, and these applications will need to be
adjusted.

Instead of `--stdin`, `--pathspec-from-file=-` should be used, and
instead of `-z`, `--pathspec-file-nul`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows
and developed, improved and stabilized there, the built-in FSMonitor
only made it into upstream Git (after unnecessarily long hemming and
hawing and throwing overly perfectionist style review sticks into the
spokes) as `core.fsmonitor = true`.

In Git for Windows, with this topic branch, we re-introduce the
now-obsolete config setting, with warnings suggesting to existing users
how to switch to the new config setting, with the intention to
ultimately drop the patch at some stage.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates

Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Copy link
Member Author

dscho commented Jun 16, 2025

/git-artifacts

The tag-git workflow run was started

The git-artifacts-x86_64 workflow run was started.
The git-artifacts-i686 workflow run was started.
The git-artifacts-aarch64 workflow run was started.

Copy link

Validate the installer manually

The installer was built successfully;
Please download, install, and run through the pre-flight check-list.
@dscho ☝️

The `bswap.h` header was introduced to fix the Windows/ARM64 build.
Unfortunately, this broke big Endian machines. Instead of fixing it
properly, upstream Git simply reverted the commit in 1c62df0
(Revert "bswap.h: add support for built-in bswap functions",
2025-06-12), re-breaking the Windows/ARM64 build.

Let's re-un-break the Windows/ARM64 build by reverting 1c62df0
(Revert "bswap.h: add support for built-in bswap functions",
2025-06-12).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Copy link
Member Author

dscho commented Jun 16, 2025

/git-artifacts

The tag-git workflow run was started

Copy link

Validate the installer manually

The installer was built successfully;
Please download, install, and run through the pre-flight check-list.
@dscho ☝️

@dscho dscho linked an issue Jun 16, 2025 that may be closed by this pull request
@dscho dscho self-assigned this Jun 16, 2025
@dscho dscho added this to the v2.50.0 milestone Jun 16, 2025
@dscho
Copy link
Member Author

dscho commented Jun 16, 2025

/release

The release-git workflow run was started

Copy link

@dscho, please Share on Bluesky and send the announcement email.

@gitforwindowshelper gitforwindowshelper bot merged commit 311e67d into git-for-windows:main Jun 16, 2025
83 checks passed
@dscho dscho deleted the rebase-to-v2.50.0 branch June 16, 2025 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[New git version] v2.50.0